Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added hit animations, updated lighting & added InteliJ to gitignore #71

Merged
merged 7 commits into from
Apr 8, 2015
Merged

Added hit animations, updated lighting & added InteliJ to gitignore #71

merged 7 commits into from
Apr 8, 2015

Conversation

Lemmmy
Copy link
Contributor

@Lemmmy Lemmmy commented Apr 6, 2015

I hope I did this right ._. pardon the IntelliJ typo

@itdelatrisu
Copy link
Owner

Thanks for taking care of this! There are a couple of bugs:

  • The hit circles are being drawn for slider tick results.
  • In osu!, the first and last circles in a slider get animated after completing the slider; in your implementation, the first circle is animated immediately.

osu! also has a kind of bouncy effect when you hit a circle, and it feels a little off seeing just a linear size growth.

There's a copyright issue, as well -- peppy has copyright on all the default osu! skin images, so I can't actually include the lighting.png image in this repository. Users will have to supply it themselves.

@Lemmmy
Copy link
Contributor Author

Lemmmy commented Apr 7, 2015

This is the lighting texture I use in my own skin, so this one should be fine. I'll get to work on those bugs right away

@Lemmmy
Copy link
Contributor Author

Lemmmy commented Apr 7, 2015

I'm not quite sure what you mean by bounciness, but it definitely does look like there is some easing (60fps at 30% speed)

Unless you mean the movement of the hitresult?

Update: Progress has been made! The slider results now finish at the same time. Found a bug, not sure if it existed before. The result number doesn't appear on repeated sliders. Looking into that now, then I'll add easing. I've also noticed that the slider fades out with the hit animation, but I will look into implementing that after #64.

@Bigpet
Copy link
Contributor

Bigpet commented Apr 7, 2015

@lemonlake just implement whatever you need on top of the current slider system (something almost exactly like it will still exist as a fallback anyway), I'll rebase however necessary.

@Lemmmy
Copy link
Contributor Author

Lemmmy commented Apr 7, 2015

New bug: Geki and katu hit results no longer appear. Know why it occurs and how to solve it, just looking into how to implement it.
FYI: GameData.java:1295 should return the result


public enum HitResultType {
CIRCLE,
SLIDERSTART,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SLIDERSTART is never used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was going to be used, but I never actually used it. I left it in there in the event that anyone in the future wanted to use it.

@itdelatrisu
Copy link
Owner

This looks really great now -- thanks again! I added a few comments in the diff, but visually this seems perfect. Are you ready for me to merge it?

@Lemmmy
Copy link
Contributor Author

Lemmmy commented Apr 7, 2015

I'll just fix those and then it will be ready!

@Lemmmy
Copy link
Contributor Author

Lemmmy commented Apr 7, 2015

Go ahead and merge!

itdelatrisu added a commit that referenced this pull request Apr 8, 2015
Added hit animations, updated lighting & added InteliJ to gitignore
@itdelatrisu itdelatrisu merged commit dda9081 into itdelatrisu:master Apr 8, 2015
itdelatrisu added a commit that referenced this pull request Apr 8, 2015
- Fixed a major bug where two hit result calculations were being performed for each slider.
- Fixed a bug where hit circles/sliders were being drawn for a miss.
- Sliders now only expand when held to the end (as in osu!).
- Use the track position as the hit result start time for circles (instead of the object time).
- Added a 'color' parameter to Curve.draw(), rather than keeping an extra reference to the slider Color object.
- Renamed HitResultType enum to HitObjectType, and moved it into GameData.
- Removed some overloaded methods (not really necessary...).
- Other style changes.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
@Lemmmy Lemmmy deleted the lemmmyvisuals branch April 10, 2015 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants